Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#106

Merged
mssonicbld merged 2 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Sep 10, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#106
mssonicbld merged 2 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* dbfa8f966 - (head/202205) [frr]: lib: Fix corruption when routemap delete/add sequence happens (#16456) (2023-09-08) [Rajendra Kumar Thirumurthi]<br>```

rajendrat and others added 2 commits September 8, 2023 23:19
…(#16456)

Why I did it
Zebra core sometimes seen during config reload. Series of route-map deletions and then re-adds, and this triggers the hash table to realloc to grow to a larger size, then subsuquent route-map operations will be against a corrupted hash table.

Issue is seen when we have BFD Enable on Static Route table we see Static route-map being created/deleted based on bfd session state. However issue itself is very generic from FRR perspective.

Thie issue has detailed core info sonic-net/sonic-frr#37 . This PR fixes this issue.
Fixes#sonic-net/sonic-frr#37

Work item tracking
Microsoft ADO (17952227):

How I did it
This fix is already in Master frr/8.2.5. Porting this fix to 202205 branch to address this Zebra core.
sonic-net/sonic-frr@5f503e5

Solution:
The whole purpose of the delay of deletion and the storage of the route-map is to allow the using protocol the ability to process the route-map at a later time while still retaining the route-map name( for more efficient reprocessing ). The problem exists because we are keeping multiple copies of deletion events that are indistinguishable from each other causing hash havoc.

How to verify it
Verified running sonic-mgmt test, doing multiple config reloads.
@mssonicbld mssonicbld requested a review from lguohan as a code owner September 10, 2023 03:01
@mssonicbld mssonicbld merged commit 6d1fd79 into Azure:202205 Sep 10, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…utomatically (#18475)

#### Why I did it
src/sonic-host-services
```
* e93494c - (HEAD -> master, origin/master, origin/HEAD) Update sonic-host-services-data.determine-reboot-cause.service (Azure#119) (2 days ago) [Xincun Li]
* 15762a5 - Fix UT test data due to timestamp break. (Azure#117) (4 days ago) [Feng-msft]
* d53f431 - [caclmgrd]Fix bfd and vxlan acl rules programming in acl table update scenario (Azure#114) (13 days ago) [Sudharsan Dhamal Gopalarathnam]
* f2dbf25 - Add unittest for caclmgrd default deny rule (Azure#113) (2 weeks ago) [Zhijian Li]
* bfa06c7 - Change dependency option to fix buildimage issue. (Azure#110) (3 weeks ago) [Feng-msft]
* ba78bdb - Fix hostcfgd crash when delete entire config table. (Azure#106) (4 weeks ago) [Hua Liu]
* 6130886 - Update ProcessStats query by using API instead of parsing ps command. (Azure#103) (4 weeks ago) [Feng-msft]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 18, 2025
…tomatically (#1363)

#### Why I did it
src/sonic-swss
```
* b723ee72 - (HEAD -> 202506, origin/202506) Fix fpmsyncd crash during pfcwd/test_pfcwd_warm_reboot.py worm reboot issue (#106) (23 hours ago) [mssonicbld]
* b8931760 - [DASH] Support trusted VNIs for appliance and ENI objects (#107) (23 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
…ically (#23882)

#### Why I did it
src/sonic-dash-ha
```
* 75af72e - (HEAD -> master, origin/master, origin/HEAD) Implement mark-delete in actor framework (#104) (9 hours ago) [yue-fred-gao]
* 8564b63 - Update dpu scope state table name. (#106) (9 hours ago) [dypet]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Mar 25, 2026
…e latest HEAD automatically (#25488)

#### Why I did it
src/wpasupplicant/sonic-wpa-supplicant
```
* 9fc464bc0 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #106 from rustiqly/add-copilot-instructions (23 hours ago) [rustiqly]
* 34f5222fa - Add .github/copilot-instructions.md for AI-assisted development (2 days ago) [Rustiqly]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants